Added start and stop, fixed bugs