merged other packages, some fixes