account management changes and other fixes