closes #520, closes #511
fix model test problem
refactor dframe selects, closes #518