eliben Cosmetic fixups