Numerous updates and improvements
Updating build