tweaked speed again + fix