fixing some issues with the actitivies