More Bug Fixes. Final Bugs are being worked on.