minor changes
removed need for dummy account