Added actual support for 24 drives
Major updates and fixes