MAN updates & cleanup