Fixed paths and added new options for setting them