Some new engines from RF, misc fix