Fixes and improvements
IT'S THE FINAL COUNTDOWN