small cleanup to code and added more sample configs