fixes and extensions.