bug and issues fixed. #7 #8