Added descriptions

and a bunch of tweaks.