More fixes, still need major fix.