Fixed camera preview & added some updates