update: drop placement + other smaller optimisations