fixed smal bugs