Added settings, fixed minor path-bugs