Added a couple of bugs and some more comments