Adjusts some inaccuracies and inconsistencies. Fixes #5359 Signed-off-by: Amir Zarrinkafsh <nightah@me.com>