Everything since your last commit

Contains many editing