Fix bug; Rename vars
Add a little bit of doc