cleaned up comments + latest merge from main