Adding classes, inheritance, modules, and fixing iteration