This is so awesome!
Fixed some stuff with regards to loops.