bug fixes, error handling, user cms