some fixes, more auto for stas