schema fix
various fixes