Fixes part of #158, I'll leave the drop tweaks to someone else