Style update + some minor changes
Added warning texts
Small fix.