events almost fixed + improvemnts