small tweaks, 2d bugfix