Troubleshooting and cleaning

More to be done, will finish tomorrow.