Fixed second loop in Comibiner, cleanup, comments