Some adjustements and bug fixes