- fixed the following bugs: