Fix PMD problems, also re-add random events in the form of a placeholder