made lots of changes, to lazy to describe all of them, almost ready for championship