fixes and improving