Live view preview flicker ref #10
Minor improvements ref #7