improved docs, general cleanup