Sorry for the delay, I've been working on the MaM update and it was hard to get anything else done. Next update shouldn't take me as long as this one.