One bug fixed and a few enhancements

The tiitle says all