some updates and fixxes