Fixes and Additions to prepare for reset