fixed some more coding fails