Fixed some stuff- I promise