some updates and extensions