more updates

continued fixes to get things working.