Improving the docs a bit and doing general cleanup