Final tweaks

Close #80