Second commit, fixed lots of stuff