Added EOL support and cleaned up a couple things