fixed output issues