chart of progress roughly working
minor chart fixes
merged fb changes