sry for mult. commits, but i fixed it up a bit more.