FIX error message, cleanup