fixes to the problem from the otjher day