close #408
confilct solved
small fixes on #408