Rename x/y to w/h for clarity
Update command-line tool to support cropping