Finished drug route, fixed bugs