finish feature dev; improve usability