Minor changes, prep for release