fix bugs and prepare for fronttalks
remove few stuff