fixed bugs and working on fb grading. need to reset db to make this work