some cleanup, fixed coordinates