fixed some issues...