Last few endpoints added, fixed a couple of bugs