Paperwhite 1 (5.4.4) support
Fixed minor glitches in 5.4.2 tree