Updates to v0.4a