bead: Bugfix #1 30/10/2017

Optimization and elimination of small errors