cleaned up some things, made timeLimit dynamic