Some more changes, not finished