Fix point updating
Fix bugs

Closes #9
Closes #10
Merge remote-tracking branch 'origin/master'