Add files I forgot to commit
%iris: %stop
Fix some buginess
Fix bug on restart