Got rid of script module for now, fixed some things