better hyphenation + some bug fixes