fixed bugged op type + added some pretties