Fix #7 and other stuff