Eliminating tickless todo, adding some extra string handling