fixed more compiler bugs