2013.12.06 Updates and improvements - still early alpha

2013.12.06 added a few collection points that are not yet compatible
with non-AD connected systems