Fixing bugs, adding addresses
Fixing conflicts