tweaks
no unnecessary s->energy init