Added preface toggle

Also added some cosmetic changes.