fixed 'hack' comments and variables