some more fixes to 2 week