Fixed help and some flag issues