fixed some remaining issues