base edit

base comments and unedited function bodies