squashed alot of bugs
close #3

tested with add