Fixed: Various minor peculiarities.