fix a lot of bugsgit add .