Jeremy overhaul + docs fixes