Updated the loop
Misc Updates... nothing special here