reworking ./account subfolder; a bunch of fixes