add Remove and Ordered
fixed parse errors