This commit incorporates most of the changes I plan for BookMacster 1.20.6