adding new features for marvin protocol (clean 2d/3d, hydronization), drawing procedures moved into beaker, some bugfixes