Multipile new checks and other stuff... need to fix a few things! o.O maybe there's a memory leak?

Signed-off-by: Swizzy <swizzy@hotmail.co.uk>