Fix bugs and add new modules