Updated script system, fixes