Finaly

huge uppdate with loads of new stuff