Fixed some Bugs & Crashes