Moar 0.1 updates

+amend last commit