fixed compile issues (uncommented lines with issues)