some review fixes after @mweibels dad