Minor fixes; about to release 0.3.1