formatting and big fixes