bugfixes and feature stabilization