slightly better intersection on queries
fix uid comparison
touching up basparser
merge errors what the hell