Pass support and a few bugfixes