Minor code fixes, Added badges