Reworked and simplified diagnose and updated README

This should also be fixed for the pyjs issue, might have real dependencies though that we'd have to install.