Fixed Issues stated in Line comments: StuyFyreLegacy Pull Request