Fix events on st8
Fix creation case
Fix the most easy cases
Clean up