some more minor refactoring; preparing memory items
38 files changed