fixed some not nice features