fixed type signatures to work with html