Fixes + output refactor
fixed B adding
Working #1