finished project feature
fixed a couple of bugs