commented out places where compilation failed

fixed other places