Fix for number of shadows. Fixes for new master assignment
Merge of master branch