refactoring and troubleshooting bugs from last night.