close #60, #59, #57, #56, #55 issues