tweaked output
Added better options and tweaks