Commands File + toString changes