some minor tweaks to get working with my project