In-progress improvements and experiments