Some stuff and fixes and things.