Updates to 0.2a