Final fixes

builds now
Merge remote-tracking branch 'origin/master'