storage files
final fixes, now the interactive testing env is more or less ready