Fix #8 and a few other small bugs