Proper annotation parsing, proper exit, misc fixes.