fixes all errors except for lack of zpython
merge