fixed final methods and some schema stuff