Tons of bugs fixed accross the board