Fixes to make it actually work... oh god