updated and new checks
Merge https://github.com/uwegeercken/jare