add and correct a lot of things