addec core classes section along with further tweaks