speced out query and general cleanup and rough in