Add and fix a lot of things...