couple of mnhn related bugfixes and modifications, also more comments, left code commented that might come in handy later