Fixing spacing. Cleaning up the api and behavior a bit.