Lot's of changes which i've forgotten to commit >_<

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