Various improvements
Added storage capabilities + various code improvements