Documentation, consistency fixes