first storage advences
some bugfixes
templates added
some testing