More stuff working thanks to sampy