extended usability / fixed bugs