Some final Changes to publish to alpha stage