small fixes and added configuration