Fixes and comments
Name Loops