some unsignificant fixes
more bubbles and unicorns