update support + code cleanup