Bugfixes book.c
shorter PV