ommented some, formated some, fixed some