Removed some features found to be useless and spruced up the output.