Close #33,#40, #41, #46, #47, #48, #49, #52