Blob tweaks, refactoring and stuff