Fix to straight checking, small changes