fixed some issues...not all