BugFixes and unification of "add new"
Fixed #123