Added call super and call inherit and fixed some bugs