More comments, moved to diff file, updates