Bug Fixes
First Cycle Fixes