Close #8. Small fixes.