Fix. And internal code improvemnts (damn my retarded else's part of "if" statments.)