Build 39

Minor changes and improvements. Locking for CTS additions.