added some modifiers and renamed scripts