mher: Cleanup and refactoring. New structure. Better call_counter handling. Ready for submission