merge in some other fixes to make development easier