git commit and minor fixes... ;)