Changed a little bit of stuff in mod_screen, added a TODO in shapes.