Added `success` indicator & little tweaks.