updates to fix leaking controls