close #1, #18 half-fix