Few touch ups to defines.