close #37 + clean ups