Fixing drawing

Now draws correctly for a few things and added color