Some Fixes and a New System

See Individual commits for more information.