Gravitational improvements and misc