fixed #15 & started implementing speed change