Fixing several parts
Adding diskbuffer support