Update credits, minor code clean up