General Cleanup, and added 3rd party software options