Pushing newer alpha 0.4 with minor fixes