Fixed comments and edited to match new version