fix bugs + delete comments + add func to Straight