Fixed all indents, added more report functions