more changes to get things running