Improvemements and fixes