Organized imports, flipped Y, other minor fixes to get working with latest firehose