Fixed bug with drawing quad
Fixed TODO.