Simplify, fix and add some things