updated some scripts for universal / usage