Bend update: agal improvement + clean up