Updates to Credits and Bug Fixes