add newline
reorder opts
Fix a few bugs
Add property options
update makefile
Failing app tests