various improvements
more various changes