some issues fixed (#11, 12, 13, 14, 15, 18, 20, 21, 22, 23, 24, 25)