Overall::some fixes/improvements