Fixed start line position bug and some other improvments