Fixed comments and some names