Fixed a LOT of things, just need to fix rendering code now...