fix some issus, stil a lot