updated with all kinds of git tips