Various cleanup/fix/style/tacos/...