Fodder's 3rd update

My 3rd update.
No mistakes allowed!- let the games begin -
I might add more commits later.