Final fixes, happy new year!