Edited stuff from new vb; updated master.