Prepared some fixes for alerts
Went through use cases and fixed/made TODO's