mostly added comments, improved some naming