bugfixes
general capturing