Misc enhancements

Would you be interrested in the following changes ? 
regards.
Gst.