Ermagerd... almost fernershed
Some cosmetical changes