fixed linux compiler errors still trying to fix segfault
found compile bug
resovled merge conflict