minor language changes, close #41 close #43