more fixes, still no totally working