User fixes and additions