fix use statement
improve output
big fixes / improvements