some improvements (in-progress)