0.1.1-2r1

Some more changes, still rearranging.