various tweaks, added smaller development set