Clean up some things. Still need to decide how to handl exceptions. #11