fix static endpoint checking and minor endpoints bug fixes