Bug correct
Several optimizations