more minor updates to get things working