Reorganized some draw code and fixed a sprite bug involving old code.