Minor bug fixes/CRUD updates