* bunch of minor improvements and fixes.