Major fixes

Errors due to the playbook took me in the wrong direction
More isses fixed