This should fix all the problems I've added. Sorry @jklausa :C