bunch of updates for my yadr