Better comments and usage instructions