fixing minor stuff
fixing closure complaints