storage box + minor changes