fix some issues; rename for continuity