core changes to methods and comments