Miscellaneous updates (forgot what updates were there but it was finalized for the demo)