Added things, fix some things, delete some things. AKA Release 1.2