User improvements
32 files changed