Minor query and aesthetic fixes