Satellites rendering and few bug fixes