Minor changes to oop macro
complete objects section