Fixes and clarity changes thanks to @skaae