Fleshed out the line and set classes some more and corrected some miss named functions in the cache class.