Fixed some minor spots