miscellaneous +/- +/-

PR of misc. bug fixes