added 'press s to start', modified pid
merged sams changes