fixing a few issues with settings and adding speed