More things working correctly