Some fixes and new modules