Some more improvements I suppose

Need a bit more fine tuning, I think I will do that once I get my new Latop
and netbook and desktop probably after I get a job :D