Final fixes for first release!