Refactoring (who needs charsets) and GUI improvements