some refactoring, usability stuff & mac unicode chars