Add debug shortcut functions
Fix user display