Fixed Drawing code

Fixed some small bits of draw code.