got alerts working and cleaned some stuff up