some updates and tests