Fixed rectangle drawing, at long last. ¦D
Merge branch 'core'