Final Commit

Bug fixes