Minor comment update
Cleaned up the application config.
More config cleanup for application
Cleanned up some application locking.