code cleanup
added speed and spread options