fixes and package doc support