Many minor changes that increase sanity/consistency