V1.0.7 - Improve start-up/shutdown

Minor changes to improve the way the system starts up and shuts down to attempt to address Issue #3. This is not guaranteed to fix the issue though as it is difficult to reproduce the issue.