Fixed Bugs. Ready for Presentation