add sunjayc and few other tweaks