lgtm with bugfixes i just made