pgoodman Fixes and stuff