cleaned up the new random stuff. added support for using the old bases.