Add description
Various little tweaks