Big fixesgit diff