fixes and extensions