Updated postfetch and some bugfixes