Various changes, version bump and stable enough to push to beta, Version 0.5b