include current user and other tweaks