Bug fixes
Added things that extract other things
Added volume related things