Minor tweaks to code and start of Account functionality

I changed stuff.