Fixed some bugs and added combining operations