batch of changes for 0.3.1.1