fixes after changes suggested