index/credits fix, minor cleanup