script updates / cleanup