Bug fixing and some module development