more things generic
fix terms