final adjustments for 0.3.1