Handle Fragmentation, small fixes #5

Closed
wants to merge 3 commits into from