Work on things
fix item bug
Merge remote-tracking branch 'tallman/master'