many small updates & bugfixes