Fixing App

Various RCAV and CRUD errors