More goodies!

Please, see commits below