Yeah. Corrections and we're in a working state again.
Time for testing and further improvements.