Fixed few minor bugs, add operation initially works.