Bug fixes and output changes per request. More test stuff