Fixed Bugs. Ready for Submission 1.0