Quick cleanup :) 

Everything works now! It was a lot easier to work with than the v1. :D