some updates and additions