Add events to relax app + minor bug fixes