Improved Drawing Functions

Added draw circle, cleaned up text, general update