Sweep: Bug Fixes, Performance Optimization

-Bug Fixes -Performance Optimization