minor changes and cleanup before putting v. 0.1 to sleep