Fixed some adding issues
merge