Clean up and continued improvements to how system works
Improved (but still not perfect) error handling