1. More renames
2. Tinkered with error visual