fix + scripts