Several changes, version set to alpha0.2.4