Wrong error message
Enforce indentation rules, update copyright date, make it work at the new location, mark hard-coded constant to fix