some updates and fixes