small changes to get things to work