put some stuff back in
fixed cmake again...