Fixing some stupid errors, hope all is well
Errors didn't exists. -.-

Apparently what I thought was lost code was there so I screwed things
up. Hope this works. :P