Final bugfixes for new chunk based internal storage
Merge pull request #73 from t00thpick1/master

Final