fix bunches of syntax issues, remove conf params due to bug