commiting from server almost all bugs fixed