final 2.1

cleaned up stuff last verion before i add accounts