bugfixes, giude additions