Renamed another function, added comments, updated doc strings