Cleared up some names and added options