bugs fixes and new module (Activity)