Removed internal mode, and a few other things