finally fixed this shit...sort of