Consistency and some docs