Optimizing, small bug fixes, drawing ghost