various fixes; custom ContentType proxy model