Finish disk array and bug fixes