Some bugfix, first nice tries