bring Dev upto date
small changes
updating to preview