additional features; bugfixes