Various bugfixes, more chars