fixed stop() + some minor tings