Bugfixes + more support for static pgn