move more configurables and add documentation