Add completable aliases
Adjust history handling
Add work account
Comment out problematic setting
Remove comment