fix basic changes