fix general errors and formatting