[@Noodles]
Alright I think I made the appropriate fixes, just double check with me to make sure I got everything. 

Also if any other issues come up.