Topic/misc updates

This won't work bc of the two commits not committed by me.