Bugfixes + thread/block config