some changes
tabs set to 2 spaces