fixed a couple of bugs. Jay's fixing the keywords