Forgot to check some stuff in. And did some more changes :p