fixed more selector hierarchies, cleaned up indentation