Many changes, towards an eventual 0.0.1 release