Fix tons of bugs from play test