Add nomacs, fix/upgrade bunch of others