Big update from pl-wiki folks