Added updated classpath and fixed small compile issues from my previous refactoring of modelstate.