Updated scripts and docs