Schema fixes and complete container_asset rename

Still probably broken.
Readd annotation functions; minor fixes

Basics are working now.