more lib and metadata changes

have to commit these before revert