Update for 0.1.1, mostly code clean-up