adding more comments and cleaning up stuff