Updated version and other minor changes