Fatal Errors and General Improvements

The details are in the commit messages.