Various fixes

btw. I found the flappy-atom repo via @holman's blog post. :wink: