Refactor completed
All logged errors are now fixed, but the messaging is still broken.