Fixed up a lot of the errors introduced with some of the previous changes. Renamed a few functions to have a better naming convention for the draw library.