minor updates
optimizations