minor fixes, init order still undefined