Fixing some more stuff. Hopefull, everything should be working now.