Added victim cache and many others

Added the victim cache and a slew of updates to multiple files to
converge with the victim cache as well as fix niggling bugs.