#46, #64: Pull in all the fixings, not sure why they didnt get in the fi...

...rst time