Fixed some small oversights...