Several Bug Fixes - rolled version