replace source package
other small changes