Credits and minor fixes