Feature/2013 12 17 fixes

Includes branch from yesterday.