fixed stuff up, working now