more changes towards CM10