major improvements on output/formatting etc, made some fixes to droid