misc
made srializer more generic and various cleaning