Improved Peer Handling, Commandline Options, Logger

please merge