Polishing the storagebox

Still over 9000 bugs...