changing paths
refixing some bugs