Fix Issues, #37, #38, #39, #41, #42, #43.