Mix of fixes from ISET and new functions for the human calculations