Redid indentation
Added more options, some comments and a rename
Reindention and adding some todos