updates merged from SteakCMS