Updates and cleanup for release