Adds and fixes