diff --git a/docs/src/custom_hamiltonians.md b/docs/src/custom_hamiltonians.md
index 17d6a0239..825e4c5c1 100644
--- a/docs/src/custom_hamiltonians.md
+++ b/docs/src/custom_hamiltonians.md
@@ -20,7 +20,7 @@ AbstractHamiltonian <: AbstractOperator <: AbstractObservable
 ```
 The different abstract types have different requirements and are meant to be used for different purposes. 
 - [`AbstractHamiltonian`](@ref)s are fully featured models that define a Hilbert space and a linear operator over a scalar field. They can be passed as a Hamiltonian into [`ProjectorMonteCarloProblem`](@ref) or [`ExactDiagonalizationProblem`](@ref).
-- [`AbstractOperator`](@ref) and [`AbstractObservable`](@ref) are supertypes of [`AbstractHamiltonian`](@ref) with less stringent conditions. They are useful for defining observables that can be used in a three-way `dot` product, or passed as observables into a [`ReplicaStrategy`](@ref) in a [`ProjectorMonteCarloProblem`](@ref).
+- [`AbstractOperator`](@ref) and [`AbstractObservable`](@ref) are supertypes of [`AbstractHamiltonian`](@ref) with less stringent conditions. They are useful for defining observables that can be used in a three-way `dot` product, or passed as observables into a [`ReplicaStrategy`](@ref) that can be inserted with the keyword `replica_strategy` into a [`ProjectorMonteCarloProblem`](@ref).
 
 ## Hamiltonians interface
 
diff --git a/docs/src/hamiltonians.md b/docs/src/hamiltonians.md
index 003f9dda2..1dd817c94 100644
--- a/docs/src/hamiltonians.md
+++ b/docs/src/hamiltonians.md
@@ -92,7 +92,8 @@ AxialAngularMomentumHO
 
 ## Geometry
 
-Lattices in higher dimensions are defined here for [`HubbardRealSpace`](@ref) and [`G2RealSpace`](@ref).
+Lattices in higher dimensions are defined here and can be passed with the keyword argument
+`geometry` to [`HubbardRealSpace`](@ref) and [`G2RealSpace`](@ref).
 
 ```@docs
 CubicGrid
diff --git a/docs/src/projectormontecarlo.md b/docs/src/projectormontecarlo.md
index db26f5d8b..e73352139 100644
--- a/docs/src/projectormontecarlo.md
+++ b/docs/src/projectormontecarlo.md
@@ -7,9 +7,9 @@ Full Configuration Interaction Quantum Monte Carlo (FCIQMC).
 
 ## `ProjectorMonteCarloProblem`
 
-To run a projector Monte Carlo simulation you set up a problem with `ProjectorMonteCarloProblem`
-and solve it with `solve`. Alternatively you can initialize a `PMCSimulation` struct, `step!` 
-through time steps, and `solve!` it to completion. 
+To run a projector Monte Carlo simulation you set up a problem with [`ProjectorMonteCarloProblem`](@ref)
+and solve it with [`solve`](@ref). Alternatively you can [`init`](@ref) it with to obtain a [`PMCSimulation`](@ref) struct, [`step!`](@ref) 
+through time steps, and [`solve!`](@ref) it to completion. 
 
 ```@docs; canonical=false
 ProjectorMonteCarloProblem
@@ -22,16 +22,16 @@ step!
 After `solve` or `solve!` have been called the returned `PMCSimulation` contains the results of 
 the projector Monte Carlo calculation.
 
-### `PMCSimulation` and report as a `DataFrame`
+## `PMCSimulation` and report as a `DataFrame`
 
 ```@docs; canonical=false
 Rimu.PMCSimulation
 ```
 
-The `DataFrame` returned from `DataFrame(::PMCSimulation)` contains the time series data from 
+The [`DataFrame`](https://dataframes.juliadata.org/stable/) returned from `DataFrame(::PMCSimulation)` contains the time series data from 
 the projector Monte Carlo simulation that is of primary interest for analysis. Depending on the 
 `reporting_strategy` and other options passed as keyword arguments to 
-`ProjectorMonteCarloProblem` it can have different numbers of rows and columns. The rows 
+[`ProjectorMonteCarloProblem`](@ref) it can have different numbers of rows and columns. The rows 
 correspond to the reported time steps (Monte Carlo steps). There is at least one column with the name `:step`. Further columns are usually present with additional data reported from the simulation.
 
 For the default option `algorithm = FCIQMC(; shift_strategy, time_step_strategy)` with a single
diff --git a/src/Hamiltonians/geometry.jl b/src/Hamiltonians/geometry.jl
index 5d2992c4c..cd2f45db8 100644
--- a/src/Hamiltonians/geometry.jl
+++ b/src/Hamiltonians/geometry.jl
@@ -2,7 +2,8 @@
     CubicGrid(dims::NTuple{D,Int}, fold::NTuple{D,Bool})
 
 Represents a `D`-dimensional grid. Used to define a cubic lattice and boundary conditions
-for some [`AbstractHamiltonian`](@ref)s. The type instance can be used to convert between
+for some [`AbstractHamiltonian`](@ref)s, e.g. with the keyword argument `geometry` when
+constructing a [`HubbardRealSpace`](@ref). The type instance can be used to convert between
 cartesian vector indices (tuples or `SVector`s) and linear indices (integers). When indexed
 with vectors, it folds them back into the grid if the out-of-bounds dimension is periodic and
 0 otherwise (see example below).
@@ -38,7 +39,8 @@ julia> geo[(3,4)] # returns 0 if out of bounds
 ```
 
 See also [`PeriodicBoundaries`](@ref), [`HardwallBoundaries`](@ref) and
-[`LadderBoundaries`](@ref) for special-case constructors.
+[`LadderBoundaries`](@ref) for special-case constructors. See also
+[`HubbardRealSpace`](@ref) and [`G2RealSpace`](@ref).
 """
 struct CubicGrid{D,Dims,Fold}
     function CubicGrid(
@@ -56,7 +58,7 @@ CubicGrid(args::Vararg{Int}) = CubicGrid(args)
     PeriodicBoundaries(dims...) -> CubicGrid
     PeriodicBoundaries(dims) -> CubicGrid
 
-Return `CubicGrid` with all dimensions periodic. Equivalent to `CubicGrid(dims)`.
+Return a [`CubicGrid`](@ref) with all dimensions periodic. Equivalent to `CubicGrid(dims)`.
 """
 function PeriodicBoundaries(dims::NTuple{D,Int}) where {D}
     return CubicGrid(dims, ntuple(Returns(true), Val(D)))
@@ -67,7 +69,7 @@ PeriodicBoundaries(dims::Vararg{Int}) = PeriodicBoundaries(dims)
     HardwallBoundaries(dims...) -> CubicGrid
     HardwallBoundaries(dims) -> CubicGrid
 
-Return `CubicGrid` with all dimensions non-periodic. Equivalent to
+Return a [`CubicGrid`](@ref) with all dimensions non-periodic. Equivalent to
 `CubicGrid(dims, (false, false, ...))`.
 """
 function HardwallBoundaries(dims::NTuple{D,Int}) where {D}
@@ -79,8 +81,8 @@ HardwallBoundaries(dims::Vararg{Int}) = HardwallBoundaries(dims)
     LadderBoundaries(dims...) -> CubicGrid
     LadderBoundaries(dims) -> CubicGrid
 
-Return `CubicGrid` where the first dimension is dimensions non-periodic and the rest are
-periodic. Equivalent to `CubicGrid(dims, (true, false, ...))`.
+Return a [`CubicGrid`](@ref) where the first dimension is dimensions non-periodic and the
+rest are periodic. Equivalent to `CubicGrid(dims, (true, false, ...))`.
 """
 function LadderBoundaries(dims::NTuple{D,Int}) where {D}
     return CubicGrid(dims, ntuple(>(1), Val(D)))
@@ -100,13 +102,15 @@ fold(g::CubicGrid{<:Any,<:Any,Fold}) where {Fold} = Fold
     num_dimensions(geom::LatticeCubicGrid)
 
 Return the number of dimensions of the lattice in this geometry.
+
+See also [`CubicGrid`](@ref).
 """
 num_dimensions(::CubicGrid{D}) where {D} = D
 
 """
     fold_vec(g::CubicGrid{D}, vec::SVector{D,Int}) -> SVector{D,Int}
 
-Use the CubicGrid to fold the `vec` in each dimension. If folding is disabled in a
+Use the [`CubicGrid`](@ref) to fold the `vec` in each dimension. If folding is disabled in a
 dimension, and the vector is allowed to go out of bounds.
 
 ```julia
@@ -179,8 +183,8 @@ end
 """
     Displacements(geometry::CubicGrid) <: AbstractVector{SVector{D,Int}}
 
-Return all valid offset vectors in a [`CubicGrid`](@ref). If `center=true` the (0,0) displacement is
-placed at the centre of the array.
+Return all valid offset vectors in a [`CubicGrid`](@ref). If `center=true` the (0,0)
+displacement is placed at the centre of the array.
 
 ```jldoctest; setup=:(using Rimu.Hamiltonians: Displacements)
 julia> geometry = CubicGrid((3,4));
@@ -222,6 +226,8 @@ end
     neighbor_site(geom::CubicGrid, site, i)
 
 Find the `i`-th neighbor of `site` in the geometry. If the move is illegal, return 0.
+
+See also [`CubicGrid`](@ref).
 """
 function neighbor_site(g::CubicGrid{D}, mode, chosen) where {D}
     # TODO: reintroduce LadderBoundaries small dimensions