Fix issues and state. Reset tabs to upstream. Fixes #55