Final commit for now...

Fixed (more or less) the broken parts of the project after the power
outage.