Adding proper exits

Title says it all.