Added some changes suggested by subzeroin

Not tested yet some no new package required (yet)