Fixed various minor things mentioned in #101.