Fixing things and stuff this time