Added placeholders where they were missing, plus ticket corrections