Small changes to output - some fix of simple errors