* few bug fixes and minor stuff
Ect, Ect, Ect

Signed-off-by: fallenangelX <http://infinity.3utilities.com/>