fixed last issues before 1.0 version