Model M Maintenance

fixes #9