solved small issues