content channges
various bugfixes