Fixed lots of renderer shit
Merge origin/master
Fixed lots of renderer shit2