Speedup
minor speedups
Minor fixes, enhancements