Fixed all received issues and cleanup. #160 #159 #155