Major Revamp Bug Fixes