adding comments and other fancyness