Script tweaking, housekeeping