fx bugs and add new file