bugfixes + contents added