more features, fixed jnlp