updated on Nov 14th. fixed a few bugs in account