Fixed include paths
Fixed some bugs