Minor changes and prepare for release