Minor fixes, making more things configurable