fixed some classes and script calls.