fixed issues due to incomplete chunk refactoring
units are now using the new chunk mechanism as well
Merge remote-tracking branch 'origin/master'