Final Commit - Boya

1)Bug Fixes
2)Testing
3)Tweeks