Fix typo
Bugfix tweaks
Add debug check for current user