Update to master again

Fix to bow.. and other shittt