added matrices, removed HIV
minor tweaks