modified some self values to maintain this context
added in better formatting for the output