Version 0.1a

Random code cleanups