fixed types and moved config to a separate .h