some bugs fixed from code-shifting coughJASONcough but one that was my bad ^^;; - Ty