combined all modules into one large script
minor changes