bugs fixed according to feedback of 0.8.7