Cleanup & bug fixes
21 files changed