fixed a bit

noexpandtab
reviewed and fixed comments