merge stuff

bug fix for getting issues