Some bugs fixed. Ready to implement expression type control