re-organization
tiny fixes