Chris branch: Clipping bug fix, code cleanup and latest credits

Chris branch: Clipping bug fix, code cleanup and latest credits