bugfixes & new properties