adding inputs to output table, hlint improvements