fix start and implement tidy