Added better output and docs