Make flags more descriptive
Closes #10