Better dependencies on the VB, tidy up comments