updated with some tweaks to config