More user improvements and bug fixes