Added stopping points & some cleanup