Some Improvements

Just some small Improvements to the Client