1 enhancement, 1 bug fix

I am working away.... but I am not happy with my progress. Still, I continue to plunk away.