a few more corrections and overrides