Cleaned up exe generation and things