fixed somb bugs