small changes after testing on ubuntu