Implement the bugs/tweaks provided by Jeff