Major Bug Fixes