closes #3305 and lots of little tweaks
closes #3324, #3326, #3337 and random tweaks
closes #3325
closes #3332
added missing image