updates & cleanup for release