some fixes in spec;