much better application parser and new options