2.06.3:nivve:8 Altbook/Base sync

Various fixes synced with the altbook files.