merged in more changes for zc706/flash