Finished with Bys

Finished with Bs + some minor optimizations.