Cleaned up
Most things working by now? I guess so.