fixed overrides and a few other errors