modified stop and fixed defaults