some updates and fixes...