StraightLine Class initial fixes