removed user email and other various fixes