Close #1

misc fixes