Edited some scripts and modules