more fixes, should work hopefully.