b3brodie minor bugfixes