added some modularity of names and the like, also added some commands