minor functionality improvements
Some minor functinality improvments