Doc improvements; some stubs for future stuff