Last Bug Fixes Before Demo