small improvements & preparations for new features