Yet a again some fixing and some debugging