further fixes
Merge branch 'gringo4' of https://github.com/hexhex/core into gringo4