updating a variety of things, consolidating and fixing vb references/components stuff.