Some more documentation. And improved some naming.