added current user helpers and small formatting fixes