some cleanup
update fix