App id in, a few bugfixes as well