Adds and fixes

Adds and fixes