config changes, unnecessary includes removal, some minor documentation, config sample included