some bugfixes (0.5r08)