GRAPHICS: Readded (modified)checks for character-drawing
GRAPHICS: Fix indentation and formatting