Merged in Janae's updates and bumped patched version