Implemented one feature request, one enhancement and some minor fixes.