fix a small bug, and fix spaces