Changed comments and such