fixed some issues, need work with update after some actions