I reckon I've addressed all the concerns (yes even the comment mismatch) --------------------------------------------------------------------------------------- Updated patch: ---------------------------------------------------------------------------------------