Fixed one issue... down to the next