more minor bug fixes. label shifts etc.