Polish

Some changes done to improve usability on Linux.