Accounts added. Fixes in some other stuff