Fixing a lot of stuff, visiually and query stuff