fixing some issues...