Fixed many paths, did some cleanup and changes.