bugfixes, notes, improvements