small modifications, needs testinggit statusgit status