Fixed, and added some touch-ups