New module and bug fixes