bugfixes, modify works