Cleanup error messages
Merge branch 'add_dummy_funcs' into set_value
Fixing code wo collimation