0.6.1 smallimprovements