Fix #6, small other changes.