Fixed some bugs and adjusted pathTypes