Fixed comments and stuff