Various bugfixes / string reformats (maybe count will work now)