ENH: fixed a couple of bugs
ENH: updated minor things