Updates & Edits

Successful merge + plus small updates.